vsprintf: Handle NULL with %pU

At present a NULL pointer passed to printf for a %pU argument will cause
U-Boot to access memory at 0. Fix this by adding a check, and print
"(null)" instead.

Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Alexander Graf <[email protected]>
[agraf: s/(null)/<NULL>/]
Signed-off-by: Alexander Graf <[email protected]>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 8b1b29fb5aa75278762a4c1222481fb42c0855c3..914fbd30cbc0f05dba95cf5b1dd4a2ac9f52f5ea 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -407,7 +407,10 @@ static char *uuid_string(char *buf, char *end, u8 *addr, int field_width,
                break;
        }
 
-       uuid_bin_to_str(addr, uuid, str_format);
+       if (addr)
+               uuid_bin_to_str(addr, uuid, str_format);
+       else
+               strcpy(uuid, "<NULL>");
 
        return string(buf, end, uuid, field_width, precision, flags);
 }